this patch fixes the bug that when "cpu" is not set in config file,

control panel complains "Error creating domain - int argument required".
Signed-off-by: Xin Li <xin.b.li@intel.com>

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 7702a7602c75ecdcafb356bc25c80e75017f7675..0ef34573265b87a8fdae08b7a3214d6a8226b552 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -155,6 +155,8 @@ class ImageHandler:
         if dom <= 0:
             raise VmError('Creating domain failed: name=%s' %
                           self.vm.getName())
+        if cpu is None:
+            cpu = -1;
         log.debug("initDomain: cpu=%d mem_kb=%d ssidref=%d dom=%d", cpu, mem_kb, ssidref, dom)
         xc.domain_setcpuweight(dom, cpu_weight)
         xc.domain_setmaxmem(dom, mem_kb)